Upstream tracking #165
Draft
Upstream tracking #165
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Remove obsolete FIXME
This change brings our Determinate Nix source repository in line with our standard branch naming.
One reason we used detsys-main was to avoid confusion in case the upstream NixOS/nix repository changed its default branch to main.
I don't anticipate that happening any time soon if ever, and so let's make the change.
Having this repo have a different branch name has a non-zero cost for humans ("oh right, different branch") and code to account for it.
Since we're shifting to internally run from `trunk()` (hi, jj) in more places, it's a "do it or don't" moment.
I choose to do it.
Rename detsys-main to main
This reverts commit 2b676c6.
This avoids problems with older versions of Nix that don't put the caches in WAL mode. That's generally not a problem, until you do something like nix build --print-out-paths ... | cachix which deadlocks because cachix tries to switch the caches to truncate mode, which requires exclusive access. But the first process cannot make progress because the cachix process isn't reading from the pipe.
With the migration to /nix/var/nix/builds we now have failing builds when the derivation name is too long. This change removes the derivation name from the temporary build to have a predictable prefix length: Also see: NixOS/infra#764 for context. (cherry picked from commit 725a2f3) (cherry picked from commit 7c3fd50)
don't include derivation name in temporary build directories
…/pr-14009 Revert "tests/nixos: Fix daemon store reference in authorization test" (backport NixOS#14009)
Tagging release 2.31.2
Sync with upstream 2.31.2
…expose-computefsclosure libstore-c: add nix_store_get_fs_closure
This detects infinite recursion within the same thread (i.e. when a
thread waits on a thunk that it's already evaluating). This is done by
storing a thread ID in pending/awaited values.
It does not detect cycles between threads, e.g. in `rec { x = y; y =
x; }` if `x` and `y` are marked as pending by different threads. But
those are much less likely in practice.
Upstream changes to prepare for the nario command
…sion-v2 Fix infinite recursion detection
…expose-logfmt C API: add log format and verbosity functions
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation
Not intended to be merged directly. This PR is a convenience to show the diff between upstream Nix and Determinate Nix (the
mainbranch).Continuation of #4.